Makefile: Move to AM_DISTCHECK_CONFIGURE_FLAGS

Since automake 1.11.2 it is recommended that packages
use AM_DISTCHECK_CONFIGURE_FLAGS instead of
DISTCHECK_CONFIGURE_FLAGS as the latter is intended
to be a user variable.

https://bugzilla.gnome.org/show_bug.cgi?id=766298

Closes: #293
Approved by: cgwalters

diff --git a/Makefile-decls.am b/Makefile-decls.am
index d8ec5ab4c345d2d1ef6ca910ebdf723668f08e23..f7ebd422a9ffa38031c2279a729c863022988b69 100644 (file)
--- a/Makefile-decls.am
+++ b/Makefile-decls.am
@@ -18,7 +18,7 @@
 # Common variables
 AM_CPPFLAGS =
 AM_CFLAGS =
-DISTCHECK_CONFIGURE_FLAGS =
+AM_DISTCHECK_CONFIGURE_FLAGS =
 SUBDIRS =
 NULL = 
 BUILT_SOURCES =

diff --git a/Makefile.am b/Makefile.am
index cf67c4ba19fa0905890bb74f31fb7494399309d5..a003af25363593cc1d6d7b4b86a37c62f1276aea 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,7 +28,7 @@ AM_CPPFLAGS += -DDATADIR='"$(datadir)"' -DLIBEXECDIR='"$(libexecdir)"' \
        -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_40 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_40 \
        -DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_40 -DSOUP_VERSION_MAX_ALLOWED=SOUP_VERSION_2_48
 AM_CFLAGS += -std=gnu99 $(WARN_CFLAGS)
-DISTCHECK_CONFIGURE_FLAGS += --enable-gtk-doc --disable-maintainer-mode
+AM_DISTCHECK_CONFIGURE_FLAGS += --enable-gtk-doc --disable-maintainer-mode
 
 GITIGNOREFILES = aclocal.m4 build-aux/ buildutil/*.m4 config.h.in gtk-doc.make